From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 24 Apr 2016 19:49:21 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3186
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8833692b29ba11c34413d6793cf6d222ccdd930b;p=emacs.git

Merge from origin/emacs-25

960f90d * etc/AUTHORS: Update the AUTHORS file
b21e9d4 * admin/update_autogen: Use #!/usr/bin/env bash
---

8833692b29ba11c34413d6793cf6d222ccdd930b